From 65c0e1fe5155ada32760ab0527c0c98d1571afb7 Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Fri, 21 Sep 2001 15:23:14 +0000 Subject: [PATCH] set radio_menu_item->group to NULL after removing it from the list, as it 2001-09-21 Matt Wilson * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_destroy): set radio_menu_item->group to NULL after removing it from the list, as it is no longer in the group. (#60869) * gtk/gtkradiobutton.c (gtk_radio_button_destroy): likewise --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkradiobutton.c | 3 +++ gtk/gtkradiomenuitem.c | 3 +++ 9 files changed, 62 insertions(+) diff --git a/ChangeLog b/ChangeLog index 556c7e68a7..4e20d60ae1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-09-21 Matt Wilson + + * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_destroy): set + radio_menu_item->group to NULL after removing it from the list, as + it is no longer in the group. (#60869) + + * gtk/gtkradiobutton.c (gtk_radio_button_destroy): likewise + 2001-09-20 Havoc Pennington * configure.in (PANGO_REQUIRED_VERSION) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 556c7e68a7..4e20d60ae1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2001-09-21 Matt Wilson + + * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_destroy): set + radio_menu_item->group to NULL after removing it from the list, as + it is no longer in the group. (#60869) + + * gtk/gtkradiobutton.c (gtk_radio_button_destroy): likewise + 2001-09-20 Havoc Pennington * configure.in (PANGO_REQUIRED_VERSION) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 556c7e68a7..4e20d60ae1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2001-09-21 Matt Wilson + + * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_destroy): set + radio_menu_item->group to NULL after removing it from the list, as + it is no longer in the group. (#60869) + + * gtk/gtkradiobutton.c (gtk_radio_button_destroy): likewise + 2001-09-20 Havoc Pennington * configure.in (PANGO_REQUIRED_VERSION) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 556c7e68a7..4e20d60ae1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2001-09-21 Matt Wilson + + * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_destroy): set + radio_menu_item->group to NULL after removing it from the list, as + it is no longer in the group. (#60869) + + * gtk/gtkradiobutton.c (gtk_radio_button_destroy): likewise + 2001-09-20 Havoc Pennington * configure.in (PANGO_REQUIRED_VERSION) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 556c7e68a7..4e20d60ae1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2001-09-21 Matt Wilson + + * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_destroy): set + radio_menu_item->group to NULL after removing it from the list, as + it is no longer in the group. (#60869) + + * gtk/gtkradiobutton.c (gtk_radio_button_destroy): likewise + 2001-09-20 Havoc Pennington * configure.in (PANGO_REQUIRED_VERSION) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 556c7e68a7..4e20d60ae1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2001-09-21 Matt Wilson + + * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_destroy): set + radio_menu_item->group to NULL after removing it from the list, as + it is no longer in the group. (#60869) + + * gtk/gtkradiobutton.c (gtk_radio_button_destroy): likewise + 2001-09-20 Havoc Pennington * configure.in (PANGO_REQUIRED_VERSION) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 556c7e68a7..4e20d60ae1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2001-09-21 Matt Wilson + + * gtk/gtkradiomenuitem.c (gtk_radio_menu_item_destroy): set + radio_menu_item->group to NULL after removing it from the list, as + it is no longer in the group. (#60869) + + * gtk/gtkradiobutton.c (gtk_radio_button_destroy): likewise + 2001-09-20 Havoc Pennington * configure.in (PANGO_REQUIRED_VERSION) diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 521b0bf12b..245bec87e9 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -323,6 +323,9 @@ gtk_radio_button_destroy (GtkObject *object) tmp_button->group = radio_button->group; } + /* this button is no longer in the group */ + radio_button->group = NULL; + if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c index 62acc85586..48148fe57f 100644 --- a/gtk/gtkradiomenuitem.c +++ b/gtk/gtkradiomenuitem.c @@ -226,6 +226,9 @@ gtk_radio_menu_item_destroy (GtkObject *object) tmp_menu_item->group = radio_menu_item->group; } + /* this radio menu item is no longer in the group */ + radio_menu_item->group = NULL; + if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } -- 2.30.2